From 86d55ec10a7f6f925099f47b6903d65d3d386d18 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Thu, 19 Oct 2006 22:05:07 +0100 Subject: [PATCH] [VMXASSIST] Some reports that macros do not get picked up by CPP if they are prefixed with $. Fix by placing macro uses in (). Signed-off-by: Keir Fraser --- tools/firmware/vmxassist/head.S | 2 +- tools/firmware/vmxassist/trap.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/firmware/vmxassist/head.S b/tools/firmware/vmxassist/head.S index b183fac54e..a4cb614c68 100644 --- a/tools/firmware/vmxassist/head.S +++ b/tools/firmware/vmxassist/head.S @@ -59,7 +59,7 @@ _start16: /* go to protected mode */ movl %cr0, %eax - orl $CR0_PE, %eax + orl $(CR0_PE), %eax movl %eax, %cr0 data32 ljmp $0x08, $1f diff --git a/tools/firmware/vmxassist/trap.S b/tools/firmware/vmxassist/trap.S index 468da0a5db..30e87adb85 100644 --- a/tools/firmware/vmxassist/trap.S +++ b/tools/firmware/vmxassist/trap.S @@ -106,7 +106,7 @@ common_trap: /* common trap handler */ pushl %es pushal - movl $DATA_SELECTOR, %eax /* make sure these are sane */ + movl $(DATA_SELECTOR), %eax /* make sure these are sane */ movl %eax, %ds movl %eax, %es movl %eax, %fs -- 2.30.2